From b21dd67d60b16101c24a67c9a7e82ff22adc45a6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 9 Feb 2012 15:12:22 +0200 Subject: [PATCH] win32: Don't crash when installed in a top-level directory MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Avoid NULL-pointer dereference when package installation directory doesn't contain any slashes. Reported by Paweł Forysiuk. --- gtk/gtkwin32.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk/gtkwin32.c b/gtk/gtkwin32.c index b582942a7e..e9ba709d87 100644 --- a/gtk/gtkwin32.c +++ b/gtk/gtkwin32.c @@ -59,7 +59,8 @@ _gtk_get_libdir (void) { gchar *root = g_win32_get_package_installation_directory_of_module (gtk_dll); gchar *slash = strrchr (root, '\\'); - if (g_ascii_strcasecmp (slash + 1, ".libs") == 0) + if (slash != NULL && + g_ascii_strcasecmp (slash + 1, ".libs") == 0) gtk_libdir = GTK_LIBDIR; else gtk_libdir = g_build_filename (root, "lib", NULL); -- 2.30.2